Source defaults from the model instead of implicitly #2985
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rcoh
force-pushed
the
minimal-trait-defaults
branch
from
5a3f4d5
to
8679242
Compare
|
A new generated diff is ready to view.
A new doc preview is ready to view. |
ysaito1001
approved these changes
Sep 14, 2023
| "json_token_iter" to smithyJson.resolve("deserialize::json_token_iter"), | ||
| ) | ||
| } | ||
| is SimpleShape -> PrimitiveInstantiator(runtimeConfig, symbolProvider).instantiate(shape, data)(writer) |
There was a problem hiding this comment.
Great SimpleShape reduces the multiple branches!
rcoh
force-pushed
the
minimal-trait-defaults
branch
from
8679242
to
aee6933
Compare
|
A new generated diff is ready to view.
A new doc preview is ready to view. |
rcoh
force-pushed
the
minimal-trait-defaults
branch
from
aee6933
to
8b629e7
Compare
|
A new generated diff is ready to view.
A new doc preview is ready to view. |
david-perez
approved these changes
Sep 18, 2023
| @@ -30,6 +30,11 @@ fun Writable.map(f: RustWriter.(Writable) -> Unit): Writable { | |||
| return writable { f(self) } | |||
| } | |||
|
|
|||
| /** Returns Some(..arg) */ | |||
| fun Writable.some(): Writable { | |||
| @@ -102,6 +103,8 @@ sealed class Default { | |||
| * This symbol should use the Rust `std::default::Default` when unset | |||
| */ | |||
| object RustDefault : Default() | |||
|
|
|||
| data class NonZeroDefault(val value: Node) : Default() | |||
Comment on lines
275
to
276
| else -> { Default.NonZeroDefault(value) | ||
| } |
There was a problem hiding this comment.
Suggested change
| else -> { Default.NonZeroDefault(value) | |
| } | |
| else -> Default.NonZeroDefault(value) |
| @@ -263,13 +268,21 @@ open class SymbolVisitor( | |||
|
|
|||
| override fun memberShape(shape: MemberShape): Symbol { | |||
| val target = model.expectShape(shape.target) | |||
| val defaultValue = shape.getMemberTrait(model, DefaultTrait::class.java).orNull()?.let { trait -> | |||
| when (val value = trait.toNode()) { | |||
There was a problem hiding this comment.
Why do we have to distinguish the case where the user passes in a value to @default that happens to coincide with the default value for the type in Rust, from the case where it doesn't (NonZeroDefault)? Why can't we always set the value from the @default trait?
Generated client code would always use unwrap_or_else(default_value) instead of unwrap_or_default().
There was a problem hiding this comment.
- triggers clippy lint
- causes a huge codegen diff
- non-zero defaults are only allowed on simple shapes so it enables some simplification of generating defaults
| val data = escape(arg.value).dq() | ||
| if (shape.hasTrait<EnumTrait>() || shape is EnumShape) { | ||
| val enumSymbol = symbolProvider.toSymbol(shape) | ||
| rust("$data.parse::<#T>().unwrap()", enumSymbol) |
There was a problem hiding this comment.
Suggested change
| rust("$data.parse::<#T>().unwrap()", enumSymbol) | |
| rust("$data.parse::<#T>().expect("this is only used in tests")", enumSymbol) |
|
A new generated diff is ready to view.
A new doc preview is ready to view. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
We weren't correctly computing defaults which lead to incorrect behavior when coupled with nullability.
Description
Minimal changeset to source defaults from the model. Other changes:
from_strin protocol testsPrimitiveInstantiatorfromInstantiatorso it can be used to instantiate defaultsTesting
Checklist
CHANGELOG.next.tomlif I made changes to the smithy-rs codegen or runtime cratesCHANGELOG.next.tomlif I made changes to the AWS SDK, generated SDK code, or SDK runtime cratesBy submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.